--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit d77d78e5fd7b8322512c71d088d91022ce452f30
Changes
4 files changed, 16 insertions(+), 24 deletions(-)
Diff
diff --git a/LXST/Sinks.py b/LXST/Sinks.py
index 29441f0..11a919e 100644
--- a/LXST/Sinks.py
+++ b/LXST/Sinks.py
@@ -17,7 +17,7 @@ class LinuxBackend():
else: self.device = soundcard.default_speaker()
RNS.log(f"Using output device {self.device}", RNS.LOG_DEBUG)
- def flush(self): self.recorder.flush()
+ def flush(self): self.device.flush()
def get_player(self, samples_per_frame=None, low_latency=None):
return self.device.player(samplerate=self.samplerate, blocksize=samples_per_frame)
@@ -37,7 +37,7 @@ class AndroidBackend():
else: self.device = soundcard.default_speaker()
RNS.log(f"Using output device {self.device}", RNS.LOG_DEBUG)
- def flush(self): self.recorder.flush()
+ def flush(self): self.device.flush()
def get_player(self, samples_per_frame=None, low_latency=None):
return self.device.player(samplerate=self.samplerate, blocksize=samples_per_frame, low_latency=low_latency)
@@ -57,7 +57,7 @@ class DarwinBackend():
else: self.device = soundcard.default_speaker()
RNS.log(f"Using output device {self.device}", RNS.LOG_DEBUG)
- def flush(self): self.recorder.flush()
+ def flush(self): self.device.flush()
def get_player(self, samples_per_frame=None, low_latency=None):
return self.device.player(samplerate=self.samplerate, blocksize=samples_per_frame)
@@ -69,24 +69,20 @@ class WindowsBackend():
def __init__(self, preferred_device=None, samplerate=SAMPLERATE):
from .Platforms.windows import soundcard
- from pythoncom import CoInitializeEx, CoUninitialize
- self.com_init = CoInitializeEx
- self.com_release = CoUninitialize
- self.samplerate = samplerate
- self.soundcard = soundcard
+ self.samplerate = samplerate
+ self.soundcard = soundcard
if preferred_device:
try: self.device = self.soundcard.get_speaker(preferred_device)
except: self.device = soundcard.default_speaker()
else: self.device = soundcard.default_speaker()
RNS.log(f"Using output device {self.device}", RNS.LOG_DEBUG)
- def flush(self): self.recorder.flush()
+ def flush(self): self.device.flush()
def get_player(self, samples_per_frame=None, low_latency=None):
- self.com_init(0)
return self.device.player(samplerate=self.samplerate, blocksize=samples_per_frame)
- def release_player(self): self.com_release()
+ def release_player(self): pass
def get_backend():
if RNS.vendor.platformutils.is_linux(): return LinuxBackend
diff --git a/LXST/Sources.py b/LXST/Sources.py
index f7eda92..6fac6ac 100644
--- a/LXST/Sources.py
+++ b/LXST/Sources.py
@@ -24,7 +24,7 @@ class LinuxBackend():
self.bitdepth = 32
RNS.log(f"Using input device {self.device}", RNS.LOG_DEBUG)
- def flush(self): self.recorder.flush()
+ def flush(self): self.device.flush()
def get_recorder(self, samples_per_frame):
return self.device.recorder(samplerate=self.SAMPLERATE, blocksize=samples_per_frame)
@@ -46,7 +46,7 @@ class AndroidBackend():
self.bitdepth = 32
RNS.log(f"Using input device {self.device}", RNS.LOG_DEBUG)
- def flush(self): self.recorder.flush()
+ def flush(self): self.device.flush()
def get_recorder(self, samples_per_frame):
return self.device.recorder(samplerate=self.SAMPLERATE, blocksize=samples_per_frame)
@@ -68,7 +68,7 @@ class DarwinBackend():
self.bitdepth = 32
RNS.log(f"Using input device {self.device}", RNS.LOG_DEBUG)
- def flush(self): self.recorder.flush()
+ def flush(self): self.device.flush()
def get_recorder(self, samples_per_frame):
return self.device.recorder(samplerate=self.SAMPLERATE, blocksize=samples_per_frame)
@@ -80,11 +80,8 @@ class WindowsBackend():
def __init__(self, preferred_device=None, samplerate=SAMPLERATE):
from .Platforms.windows import soundcard
- from pythoncom import CoInitializeEx, CoUninitialize
- self.com_init = CoInitializeEx
- self.com_release = CoUninitialize
- self.samplerate = samplerate
- self.soundcard = soundcard
+ self.samplerate = samplerate
+ self.soundcard = soundcard
if preferred_device:
try: self.device = self.soundcard.get_microphone(preferred_device)
except: self.device = self.soundcard.default_microphone()
@@ -93,13 +90,12 @@ class WindowsBackend():
self.bitdepth = 32
RNS.log(f"Using input device {self.device}", RNS.LOG_DEBUG)
- def flush(self): self.recorder.flush()
+ def flush(self): self.device.flush()
def get_recorder(self, samples_per_frame):
- self.com_init(0)
return self.device.recorder(samplerate=self.SAMPLERATE, blocksize=samples_per_frame)
- def release_recorder(self): self.com_release()
+ def release_recorder(self): pass
def get_backend():
if RNS.vendor.platformutils.is_linux(): return LinuxBackend
diff --git a/LXST/_version.py b/LXST/_version.py
index df12433..f6b7e26 100644
--- a/LXST/_version.py
+++ b/LXST/_version.py
@@ -1 +1 @@
-__version__ = "0.4.2"
+__version__ = "0.4.3"
diff --git a/Makefile b/Makefile
index 225c19b..7eeb1c7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ build_wheel:
python3 setup.py sdist bdist_wheel
rm ./skip_extensions
-@(rm ./LXST/*.so)
- -@(rm ./LXST/*.pyd)
+ -@(rm ./LXST/*.dll)
windll:
cl /LD LXST/Filters.c LXST/Filters.def /Fefilterlib.dll
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────